From 362b5a01927901e66b9779efbf737cf529c34e81 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 27 Dec 2010 11:56:26 +0100 Subject: [PATCH] * net/tramp.el (tramp-default-user-alist): Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp-sh.el | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a4966aab3d0..0b3cfbdb80b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-12-27 Michael Albinus + + * net/tramp.el (tramp-default-user-alist): Do not add "ssh" based + methods, otherwise ~/.ssh/config would be ignored. + 2010-12-26 Stefan Monnier * emacs-lisp/rx.el: Make it a superset of sregex. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 6bd3043a718..d5fa4eb76e8 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -386,13 +386,13 @@ detected as prompt when being sent on echoing hosts, therefore.") (add-to-list 'tramp-default-user-alist `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu")) "\\'") nil "root")) +;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored. (add-to-list 'tramp-default-user-alist `(,(concat "\\`" (regexp-opt - '("rcp" "remcp" "scp" "scp1" "scp2" "scpc" "scpx" "sftp" - "rsync" "rsyncc" "rsh" "remsh" "ssh" "ssh1" "ssh2" "sshx" - "telnet" "krlogin" "plink" "plink1" "pscp" "psftp" "fcp")) + '("rcp" "remcp" "rsh" "telnet" "krlogin" + "plink" "plink1" "pscp" "psftp" "fcp")) "\\'") nil ,(user-login-name))) -- 2.30.2